Merge.
authorSteven Smith <ssmith@xensource.com>
Mon, 25 Sep 2006 08:27:46 +0000 (09:27 +0100)
committerSteven Smith <ssmith@xensource.com>
Mon, 25 Sep 2006 08:27:46 +0000 (09:27 +0100)
commit782db06199df4068348296331f0203973b72a4c4
treeb6b4159eed6e79b73475562d786380974f68501e
parent4d0c4def88745a1aea101f33926f457198a2363d
parentad27570a65a9ae160d65bf1d80d8c433170f3036
Merge.